Fix figures, plus minor typo fixes