some more fixes
merge