Assorted Fixes
Merge branch 'master' of https://github.com/Psiryu/4000War