Incremental improvements and some formatting changes.