some minor changes
fixed merge minor conflict
updating timetable