fixed stuff in timeslot and timeslotmodel