fix parsing and quoting