fix broadcast bug & notifications bug