various small fixes
Merge branch 'master' of github.com:Amadiro/Skyport-logic