some cleanup, streamlining, and reporting tweaks