Nations: Bug fixes

- fixed two bugs that could cause crashes - fixed several minor bugs