more scheduling bugs fixed