and some more grammar edits