and some more edits