Pretty printing feature +minor edit

I understand if you don't want to merge this until you're certain that my other change didn't break anything, but I'm as close to certain as I can be that it works. :)