attempt at fixing some timers