Broadcasting fixes and final ver(I think! :P)