fixes for overlapping timeslots