Fixed scheduling to allow for non-event scheduling and fixed timezone issues