Fixed remaining broken refs and updated bib file