adds country name, robust mkdata/rmdata commands, touchup style