Changed a model, did some other good fixes