Add country support. Fix minor typos