Modify plots

Fix up plotting.py and related changes in latex.