new calendar and template fixes