small echo fixes
small fixes