fixed bugs with reports

All Tests pass