Added a bunch of references.
Adapted the conventions as discussed.