Significant cart / ordering improvements