Better bib style
More work on the new draft