Updated version

Consolidated bib file, imporved citations, some more text.