Edits to shipping and fulfillment
More improvements to shipping and fulfillment