minor improvements to scheduler