Fixed the models; untested.
Fixed things