#28 lots of printing improvements