more cleanup. SemiCRF still broken...
eh.