Fixes to pretty-printer

Fixed to gel with Nate's update to parser