fixed bugs with timetable