Calendar Bug Fix

works to load stuff into calendar.  minor bug fixes needed still.