Final nations fixes hopefully
Merge pull request #174 from ZomgPonies/master

Final nations fixes hopefully