Add a new figure. Minor refinements.