tools: more countryblock tweaks.