Fixes #1, fixes #2 and respect the difference between price and surcharge of payment and shipping method.