Incremental updates to cart
Merging cart fixes