Updated Echo and Makefile.
Improvements.