improve sub stuff
fix teams and subs