More schedule tweaks, still not perfect lol