merge
updates
updates
Reworked footnotes.
merge