fixed schedule many bugs and enhancement