Edits and comments from James.