Improved output some more.
Hopefully didn't get rid of too much.