Just watched this one yesterday, myself. The continuity things always bothered me. Remember, my first FS eps were DNA Mad Scientist and They've Got a Secret, then I saw the rest of season one before this one, so I already saw John behaving, for the most part, like he knew what he was doing...