intr&concl
completed merging from upstream
added new references and updated bib file