Added echo, fixed bugs