Partial commit of latest crafting-related changes