Refs #372: updates in response to review