Schedule, run, a few fixes