add links and other refinements