Nicer figures, as requested by Garrett.