Some tweaks, added bib and updated Makefile