small changes; starting to change the calendar functionality