Scheduler fixed bugs and some remarks