Justin fixed squad surround behavior, other fixes