Smaller set sizes
Fix always swaping players
Merge remote-tracking branch 'origin/master'