calendar fixes
calendar fixes