start work on quoting fixes