Timer now correctly resets on turn change