That's a lot of character development, I'm glad they can get along ... or at least from now on because there really was no reason to be in bad terms (well, there's Nekozaki's negative thoughts... lol) and yeah the teacher is creepy, I mean, just look at her eyes and the way she smiles all the time, mmm mm mnope, that's not a good sign.
"What are you, a girl!?"
Well, as a matter of fact...