tidying up delegates
speaker linking, more media rules