Fixes crafting with full inventory; Clean up crafting code