added traits model.  minor simplifications.