Collisions and bounds fix