improved timers
some fixed timers