improved country models
code will break, just push your stuff, I can quickly fix it