Other fixes.
Overhaul object models.