bugs fixed in scheduling