More minor changes to the model