MAP-853:  More reporting!
Bunch of warning/comment cleanup