moving vocabularies elsewhere; changing some assumptions from Oregon Digital; adjusting for a bug in AF7