Reporting improvements

Uncategorized