scheduler improvements