calendar + events fixes