Re-add prettyPrint for it's usefulness. Add other minor changes.