Changed post-formatting, misc fixes