Rerunning config/mapping changes from positive-scoring branch by hand