Some minor changes all-around. Changes to hierarchy of Model.