Add support for bundle and ssrcs
Some more tidying up how stream management behaves.