Next round of report changes and bug fixes