more data model bug fixes