rollup now handles ending of sched maint correctly, code improvements