adds conjugate gradient with jacobi preconditioning
fixes some comments