Merge some changes

merge a bunch of pretty-printing.