Country codes

fixes #701 did this in a bit of a hurry, i have to update regex etc, but this should work for now.
I concur, I think it'd probably clean up all the code