Adding some echos, fixing some bugs