various fixes
merge