Add broadcast message and fix status