more scheduler improvements