Improvements to output formatting.