Pretty printing update + bugfix