refactoring
refactoring
added echo_or_idle behaviour
fixed some bugs