Some basic modifications to report code to add more aggregate statistics