update, timetable and somefixes