Corrected timing error since sample size is now a power of 2.
Made both tuning a little less stringent.