Change the refs to bundle and msid
remove some stuff that we need to discuss more
Fix RFC 5104 to 4585
add old