improve setPeer and listPeers
Merge branch 'master' into console