various adjustments
Merge branch 'master' of github.com:ANerd/Skyport-gl