more fixes to quote argh