Converted refs to Bibtex, merged text, added figures