several updates and formatting changes