Minor changes to initial Calendar module
Minor changes to initial Calendar module