Move more stuff to report, minor cleanup

One last PR :)