Fixed some things in the model.