Only complaint is that near the end, the villain-ess suddenly knew to call him "The Doctor", though he was never ever introduced to her as such. She just "knew" his name/title out of nowhere. But other than that... Wonderful.
When they first met after his de-shellacking he said "I'm the Doctor and you're nuts, and I'm going to stop you."