Added enchantment support, fixed names