did some clean up to how Locations and GameElementMap interact