fixed some errors in the data model