small fixes
small fixes
small fixes
conflicts merged
comment