Apply collisions detection, fix fire margin issue