various fixes
merge changes