add links and cleanup