make some fixes on calendar