tweaks to country model methods