I've read the entire manga series. It's pretty great. I'm up to date on the anime, too. This particular even in episode 25 seemed to happen slightly differently than in the manga if I recall correctly. It was much more dramatic this time. And... homoerotic kinda. Foot massage? :P