small fixes
merge
merge