small fixes
small fixes
merge solved