Get wrapping correct on timers

I fail order of operations forever.