Revert "Remove R3 from Configuration Team"

This reverts commit 7c8d9f3fed2e4683ae770903f6098ceec3f9ea6b.
Various map fixes