Made fixes to the report as per Tayfuns recommedations