Brought scheduler back completly, fixes #1502
Merge pull request #1503 from ether/feature/ffFixes

Brought scheduler back completly, fixes #1502