Added p1 evidence estimator, speed improvements.