Fixed dependency issues, updated bib entry stuff