a little more output cleanup
lots of cleanup