some bugs in calendar fixed