Some report cleaning
Lots of additions to the report
Some more report reordering