Clean up figures and add figure links
Improve self-links
Improve formatting
Conform to American English