Classifier.Classifications now returns a map
Move the definition of classifier.increment()
A bit of tidying
Finish the last classification methods