added more logic to prevent timer from going crazy + some more tracking players