Improved the printouts