Improve text output
Small fixups I missed during the rebase