Several edits