Updates to stepping, numerics (by Andres), misc fixes
upstream updates