Fix up formatted printout, plus other niceties