Some formatting changes and other such things.