Fixed a few lingering bugs
A lot of work on fixing the report