Use svd instead of eigs
Some TODO notes added