Geoff feedback

Edits for @gschorkopf