last round of updates from reviewers