More updating of links, etc.
Refs to origin