Term mapping added who and when, and Vocabulary=>ConceptScheme.  Much renaming/refactoring/fixing.