Tamed the long quote form and patched up other stuff.