Expanded links, misc fixes