separate classifiers handling (well, most of it) and improve some minor things