Tweaking output

Decided I don't like the way I wrote myself into a corner with
white-wolf style output and redid part of it.