Small fixes and formatting changes.