[CLEANUP] Improve cross-links

Improve some cross-links and markup a bit.