Fixed a couple errors and improved plot creation