Updated Peer & Chat Server logic