Fixing a deadlock.  Now to add the missing step identified by the failing assertion
Adding untested rebinning code under the hopes this was the only bug.  Yeah right.
Adding debug info