Pretty printer and many enhancements