More improvements to gnuplot script