several fixes
merge