More scheduler work
Get rid of scheduler type.
Add additional debug messages