Revamped and cleaned up much of the crafting code