bunch of pricing fixes