+ further improvements to schedule handling