team agnostic + more tweaks