prettyprinting
various minor fixes