Fixed and improved bibtexs