improvements with report generation