Edits in response to EH comments