some timer/reset fixes to prevent inf loops