Part working version of sympy covariance with new params version.
Minor merges.