Fixed some bugs and allowed disabling calendars (time only)