A bunch of cleanup and a little work on reports