Latest chnages - see notes

fixed services not updating discount, limited the discount to 10%,
chemicals and other discounts are separated