Minor tweaks to output.