Tablemodel & fixes