reporter cleanup -- ready for mini-release (I think)