Some more printing improvements mostly