Final edits and pull request to upstream