smoother collisions
Merge branch 'coll'