additional work on quote calculator
fixed merge