fixed calendar bugs