small cleanup and a packet/mode for Lightning Bolts