Working States and Countries

More Fixes