Add links + fix refs