tweaks to model, etc