CALENDAR EXPANSION BUG FIXED AND GOOD STUFF!!!