Fix ordering and add links to docs