fixed some self conflict issues and other timetable issues