Some Sync Stuff, corrected some Data Model Parts