Update docs based on latest wiki content

Also includes a couple of tweaks and a fixed link