Made some preparations (and reparations) to prepare for bullet collisions.