ShoppingCart7 UC updated + minor simplifications