huge calendar improvements