Major fixes to discriminative experiment.