Round of edits from Chris.