Fixed a bad IB connection. Further refinements.

Still not ready...