This episode made my cheeks hurt from the grins, and if I wasn't smiling (or making dolphin noises--quietly, because it was very late when I watched it and didn't want to wake up the roommates) my chest was twisty with love and care for Ronon, and Teyla, and Rodney and John.

Bless the writers for continuity and for giving Ronon the amazingness, and putting Rodney in the bath he was talking about (and have John announce he won't get in the bath with him *g*).