Added and changed a lot of things in the model.