[PATCH] timers fixes/improvements