Lots and lots of reporting and UI improvements