Update product, fix bugs