Formatting changes and sundries.
A ton of work to do.