Improved printing somewhat