Collision and minor bug fix