better quoting and marking