for the second part, I think it was just their relationship improved, to the point where they could end up hooking up, even though he had tried to force himself on her at one point.
it's been a while, so my recollection of things is hazy, at best.
Don't you agree, Zach?
https://streamable.com/bmh5oq