Added more timers, reverted a small supposed-optimization that didn't
help and broke generality