Fix timestep
Clean Timer