Improve the logging

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Further improved logging. Re-chosing a peer does not work yet

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>