Teresa: Fixed most bibliography problems.

* Did not fix the & issue.