Add links and cleanup