Updates reports and adds general improvements