Updated to include EDH/EDR bib info, added some bib as I found it