Much improved 'zero_point' finding; avoids theta=0 problems.
Clean-up.