Fix #22; more work on model changes.