Flesh out some helpers, fix up models.