more bug fixes on calendar