Fixing X-axis of graphs.  More rewrites