final commit, responses to code review