hopefully fixing enchantment issues and adding more options