Redid the collision detection! It's better now!