add links, cleanup code again