add links and fixed bugs