Collision tweaking - still needs work - much better