a few more edits