Minor edits from Mark