General proofreading and fix up