fixed echo stuff