further calendar improvements