Couple of fixes

[d-t-w]

Thanks again @jacob-m-barnes - the environment variable quoting is particularly useful. I'll update the readme that suggests deliberately quoting input and release this update.