SKU instead of product ids, Small tweaks