More stats and math bug fix
More stats and math bug fix