assorted prettyprinting fixes