More edits and comments