Minor tweaks + team model