#1060 Cart Fixes

Resolves #1060 and others, pending a few final changes