Change quoting on echo commands; add more dependencies.