Fixes and cleanup. CalendarDay now shows vents