Added the -e option to various echo commands