broker and worker roles beefed up, collector (for now) takes on both