Add product, minor fixes