Address most of the remaining tasks Roy gave us.
Move figures to prevent issues.