Add Event broadcast possibility

and some clearing