Oh, I've got all sorts of things to say about Andrew yet. I mean, I sorta liked the guy for awhile there, but his appearance in "The Girl in Question" as a followup to "Damage" - waaay too much responsibility being given to the guy IMHO. So, without spoiling too much, I plan to, ah, address that.

And you are so right about Buffy not being happy. Probably she'll be even less happy once she hears the whole of the plan, which'll be next chapter. : )