added timescale x axis
changed data preperations