Minor edits after first read-through