more classifiers in dataset preparation, TODO: cleaning
some cleaning in prep scripts