Adding some more info during pairing.  Closes #39