Fix: more arcane envelope mechanics.