cleaned up entire document, added in-text references to the bib
merged changes