Fixed bugs and optimized smoothing params

Also added adaptive epsilons