fix calendars, add events. Add