getLocation fixed, timetable fixed