fix some problems around single and double quotes