bugfix-release, solves the controlled-vocabulary bug and adds components/contained functionality to DataSets
