Improved classifiers
Many changes