Plotting updated - faster from disk, colors fixed