Minor improvements

* Re add which
* s;echo;$TO_ECHO;