clean up, edits, and corrections