[TIDOC-1005] Address comments and fix some syntax typos with Calendar