Tidy up Figure 9.
Fix Figure 17.