figures, and some other updates