corrected global function names, added additional calendar fields