some changes on data models (and corrections in the code)
some changes again on observational datamodel