calendar some fixes