+ added some fixes to the scheduling process