Edits and more comments