better implementation of timetable

better implementation of timetable and fixed parsing issues