classifier fixes
update khmer branch