timers and other fixes