reorganized values and fixing stats