cart and various fixes