few model tweaks