Add in most other references
Change to correct style
Pare down to actual references used