Fixed/added Jacobian calculations