many fixes
merge