prettyprint improvements