cleaned up for HMM->CRF overhaul