A few tweaks for stability, and preparation for auto-crafting (maybe)