some more edits/additions