Some improvements to the output formating.