the last of Andrea's new images; some fixes