General work and formatting changes.