just made some fixes for calendar