How did I miss your comment? Sorry about that! Anyway, did you see the leupagus did a revised version of the episode (in script format, unfortunately, though I didn't find that style as annoying as I normally do since the story is so good)? It's here (http://archiveofourown.org/works/262351), and for me it fixed the majority of the WTF moments of this episode.