no i'm pretty sure you are right which is pretty much why epitaph one was such a great episode (or at least one of the reasons)
seriously, I don't care if this is regarded and cult television, or whatever the hell joss wheddon shows are classified as these days, but in terms of quality, this show should have been canned before the first season even ended. unless there is like something major happening in the near future i don't see this show getting a second season, and I really hope it doesn't if it is just going to be more of the same like this, because it really has done nothing to deserve it, other than having been created by Joss