cleaned stuff
Now the time doesn't lag