Misc. enchantment work, some revision will be required.