Collision bug fixes. We may be done here...