I was actually expecting the fight between Genevieve and Buffy to happen a few episodes later, but I'm guessing there will be another confrontation at some point.
Love the parallels between Faith and Genevieve. I can see why they became so comfortable around each other so quickly.
I have to say I was a little disappointed how Buffy so quickly lapsed back into not trusting Faith. I'd have thought after Season 7 that they'd be more comfortable around each other.
I'm sure Buffy will feel bad once she speaks to Giles, we just have to hope Faith hasn't had her head chopped off in the meantime. LOL.