Provider fixes #2

Here are the WireBox provider fixes again.  Most of the comments from the first pull request still apply,  but I rearranged a couple of things.  Let me know when you are available to go over these changes.