Tweaked the threshold a bit, and fix the map and player color check.