I'm going with girlfriend - NO RINGS! Though I guess if they stayed together longer than 'less than a year' it would have happened.

hmm... Yea, I would have liked more info on how McKay got to Atlantis, and John's run to the gate. I think they could have spent more time on this instead of having John get back before the end of the episode. I wasn't minding the John and Rodney show, but I think TPTB was trying to limit that. Oh well.