Updates to calendar
More updates to the calendar, now fully functional