Fixed major errors in the classifier trainer; right tokens are incremented now
More cleanup on the tokenizer