Some minor tweaks to output