added clustering
clean up + more classifiers