Commit, w/ correct header comments