dif bug fixes
merge