fixed calender bugs more

fixed calender bugs more