Latex template bug fixes and bibtex entries