more tweaks to output, everything else is peachy