new data model working (bugfixes)