Fixed the last issues in the collision detection for stage 1.