Moar fixes to prettyprint