Umbridge is what really surprised me, I think I did the spell wrong because for some reason she's positively bubbly now and loves working with children. She'll still get what's coming to her and quite frankly watching her coo over first years makes me want to vomit. At least I don't have to worry about her torturing Harry. 