The bug fixes start

MAJOR fixes for collisions