More bug fixes.  Failover and failback tested.