countries and other fixes