added psi and nl to accomdoate for source term hook through solver and calculation of nonlinearities as optional