more improvements to cart and security issues