Move team logic to collective; Reintroduce morale bonus for keeper as team leader