Fixed a bunch of silly errors after first shakeout tests.
Fixed up some dumb things in report_metrics after initial shakeout cruise.