broadcast removed, fixes made, cleanup