1. Correct usage of ChiSquared again
2. Added new options