+ some more fixes on quote

Signed-off-by: Euhow <euhowzy@gmail.com>