fixes to classifier