simplified calender class and more comments