calendar fixes
more tweaks