Loads of bib fixes.