continued tweaking prettyprinting from the parser