cleanup and fixup links from last commit