Cleaned up a lot of report stuff. I also realized I forgot to add the report on the commit before last :(