Brushed up some Calendar stuffs