added the calendar and some minor improvements