more fixes
merge conflicts