Collisions Fixed

No major issues with collisions