Added better data plotting, now with axis names