Finish work on ControlledVocabularyTerm, some refinements, checkpoint people