fixes to calendar