Fixed bugs

fixed combining in the hut and combining and