Improvements to the enchantment, and a format.