Changes to some models, and further testing.