minor tweaks to output, keep output types on respective terminals