Fixes

Formation Limitation on Defender! #4
Reshuffle fix