Various changes to reporting, cleanup etc.