Various mods; added :: syntax for quoting strings in command line