Better reports (6/20)

Better reports