calendar feature bug fix and improvements