bugfixes, preparation for crafting