Miscellaneous changes. Broker nearly complete