Vast improvement to plotting