Update language control + improve stats calculation