added country support and some clean-up