Renamed files/classes to be more descriptive.
Make some of the events more descriptive.
Update to latest working copy of report.