couple minor additions to the model