fix a bunch of bib stuff