Small cleanup and addet BroadcastTextBuilder for some stuff