Some cleanup, plus fixing the floodlight box rendering.