multiple fixes
merge