Final edits and commit