update Timer & bug fixed