fixed timers and cleanups