various changes, collision working
Merge branch 'master' of github.com:Tirmenat/solara