Revert "Fixed Bug with average of tau."

This reverts commit 58d67da24e40b390f03825f66e055bab91dc19d4.
Revert "Deeper Integration of average calculation."

This reverts commit 93906c0154fc31a3aaddc746d4453f0431f053cd.
Fixed bug with average of tau-not ignoring different signs anymore.

Also reverted back to calculating average after DP is done.