Lots of shop/product related changes