fixed 2 little bugs

changed echoes and removed old todo