added timetable exceptions plus more