Improved and fixed the reports.