bug fixes, classifier stuff