more calendar twaks
calendar fixes