a lot of cleanup in code and how peers are discovered with upgrade zeromq