More edits and additions