Hello: I have checked all the items you asked about, and the simple answer is that either of the edited versions is correct. The English language has many variations; my editing is correct, and so is the other editor's, so you can choose whichever you like.