PriceModel added, other small changes