Minor refinements to the model