calendar commit and fix bugs