bug fixes and added more granularity in the repackaging of reporting