Fixing and finishing up schedules