Added quotes to echo commands and for variables.