Some clean ups.

Also added Arbiters to debug log.