done some more edits