Set MtgPricer back to previous design. Lot of small fixes