loads of minor changes, made the pricing_rules make more sense