Fixed a lot of plotting things