more edits from reviewer comments
...