Dual index - refinements

Only to be merged after:
#168 has been merged
after testing with varied pipeline analyses