quoting and fixes