Adding better bib generation
Improved makefile