Fix Voodoo;
Lightning cleanup;