Add compound expressions and some footnote links