minor tweaks and cleanup of ContributionReport