Returning fees that stick

Found 2 bugs tonight, essentially a reverse of our other bug.

Bug 1: Fees that are configured to apply continue to be charged. To clarify, we use a reorder button for customers to repurchase their orders, fees should not apply to these. We have each fee configured to only apply one time to each order, and they do not appear in the checkout, but show back up in the checkout review. (our last bug was that fees would drop off in checkout review, which was an ubercart handling of attributes)

Bug 2: Bug two was discovered trying to adjust an order with the mishandled fees. admin/store/orders/(number)/edit allows the administrator to remove line items from the order, but for some reason the fees will not drop off the order

In this adventure we found that our original bug was a ubercart issue... a new patch is available which we'll try to see if it will remedy this: http://drupal.org/node/721412

other assistance would be greatly appreciated