fix Game.swapLocations function.  (old destinations were not being removed and  swap was creating multiple/duplicate mappings.)