Fix the timestamps for time series data & many other improvements