Reorganized, improved plots