eigs: further fix and cleanup