Many revisions and formatting changes