Use the scheduler properly
Adding some fixes to the scheduler integration; NOTE: There is some problem with the observable merit function as it will not properly select an observable target. Need to look into more.