Increase numerical stability and fix starting point bug.