new calendar and fixes