Added validation for swaps to prohibit illegal moves
Nicified a couple lines of game code