Check initial pair indices and some cosmetic fixes. #25