some final model tweaks