[WIP] fixes for demo#1142

wkozyra95 wants to merge 23 commits intomastersoftware-mansion/smelter:masterfrom

@wkozyra95/fixes-for-demosoftware-mansion/smelter:@wkozyra95/fixes-for-demoCopy head branch name to clipboard