quite a bit of work debugging revised Categorizer class; 280 of 325 tests passing