Add calendars and tidy-up