Adding links, final tweaks for Jeff