corret some data model bugs