A series of reporting enhancements and bug fixes