fixed schedule bug and calendar bug