Team scatter improvements

First attempt at clean up, probably has many errors - but tried to
streamline using improved Scatter and Broadcast