Better reports (8/20)

Better reports