merge cleanup and proofreading