Calendar

a lot of improvements upon the calendar.