some fixes'
merge fixes
demo fixes