Fix bib issues, cleanup, two-column