tweaks
moving some things around
getting started on colliders
Merge branch 'dev'