little fixes on model for calendar

events weren't pulling in child objects correctly