Connect-As Peer only, tidy up some parsing code
[FOLD] tidy up
Use weak_ptr for peers in Overlay maps