Fixed some bugs in Pretty instances
Renamer refactor (untested)
Renamer works again