Swap Resistance and Enlightened
Minor fixes