Made a few changes to the Calendar classes.