updated calendar and core with fixes