More improvements to output