Working on quote ordering, and cleanup