a couple more edits