calendar Improvements