turn off -x and add echo's