Fixed master broadcast bug
Fixed some null pointer exceptions