some small bugs and working on the new data model