I still don't know, when McKay called him John?! I read the transcript , no subtitles so far. He called him Sheppard only before?

Lol, yes the inexperienced jumper were very impressing. I wonder, though, why did get McKay to destroy the missed asteroid before the tower and not Sheppard? Would have been a great action scene for him.

I think Sheppard is of the easy forgiving type. And as McKay puts it, they need to work together. And the milk was already spilled, and Sheppard put her in quarantine, what is there more to too? He can't send McKay to the brig, ever! :-)