Total completion of refactoring, got all the bugs out of the refactored classes (finally!) :-)