fixed international shipments, checkout refactoring