Add links and tweak heading names.