edit cart update, fixes
merge sann26 conflicts