Changed terms again, organized code, make use of artifact/enchantment data