some structure fixes
Merge branch 'master' of https://github.com/gulch/gulchTrickz