Fixing history, adding links, etc.