Fixes to schedule logic; still cannot limit schedules to enrolled users