Continuing to update references.
Tweaked references further.