Adding Jacobi
fixed type issues