main fixed, calendars stuff added