Enhanced Enchantments

Fixes and expands vanilla enchantments to do what they always should have, staying as close to vanilla as possible.