fixing quoting issues; fixing path resolution issues.