More improvements to classifier tool.