Fixed collision and improved collision performance.