A whole bunch of tweaks and some reformatting.