Colliders in the proper places

Scales also fixed.
Merge branch 'master' of https://github.com/infinitesolutionstggj/MyElephantTastesAwful