fixes
new calendar and fixes