update with links, and cleanup