edits/comments throughout