Fixed a number of issues with the calendar.