Fix bugs (collisions and take off points)