Add reporting, and minor tweaks