Made small improvements to TeamBuilder and move selection.