Placeholders for figures; some fixes