Enchantments overrided (takes time instead of levels), untested
Minor cleanups