Actually 21000, as it happens, that being the number of words I'm up to with the rewrite. My main character now occupies about as many scenes as she should, and, more importantly, I want her to do so. Before, she wasn't the most interesting character in the thing. Now, while I still have to admit to a certain fondness for Bob the Vampire, she's both interesting and capable of being funny without looking like an idiot. That's quite a hard balance to strike, but possibly an important one where comic fantasy is concerned.