Final Fixes to Cart 1