Improve context and add links to source code