Various improvements working toward getting links for spider.