Correct the time scale and rename a few variables so they're clear