moved some logging around in broker