[FOLD] PeerFinder fixing and tidying