more fixes
merge