PR for issues #803, #683 (Shipping files)

Had to overwrite the UPS and USPS files with the final ones I have in
my computer, which have the modifications.