Minor changes
Broker improvements. Client timeout