V.1.0.4 integration

Just adding fixes to scheduling in this release, and increased coverage for scheduling.