Deal with quotes + address various comments