More edits/additions