updates, there's still a new bug in the scheduler code