some tweaks and checks
Merge branch 'master' of github.com:edahlseng/worldmatrix