Remove some accidental cruft left from incorrectly merging
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers