Added Enchanting; misc changes