cleanup, print chi2per
fixed merge conflict