fixing report generation and organization scripts