Small improvements to output.