Lots of thing for calendar and fixes