fixes from reviewers
merging