Fixed SoF and points calculation.