small fixes
add class CalendarData