Lots of crafting tweaks, slight code cleanup.