Oh yeah, I remember that episode where Kirk and Abraham Lincoln have to fight Genghis Khan (or was that who it was?) plus a bunch of more future-y bad guys for the moral edification of those aliens. I do remember thinking it was nice they didn't *just* go for bad guys the audience knew, even if they did get marginal development at best.