Better footnote setup
Merge branch 'master' into full-tikz-header