Logging + Misc cleanup

Correct.  ok, LGTM, I'll merge this.