CalendarDay now shows correct events + fixes