tools: further tweaks to countryblock.