fixed echos

Has not been tested