Scheduling checks fixes and upgrades

Don't merge until Monday 2/17, I might add more things if I have time.