Cleaned up the logging.
I think I got the peer-detection issues resolved (for now)