add links and clean up