minor improvements to quote section; separate some parts of the schema