Lightning Bolt Fix

Rapid fixes, lasting impact