Some very clean crafting fixes that would fit seamlessly with the game

I re-uploaded this on general discussion.