scheduler
improvements