schedule tweaks + fix