p2pserver & client bug fix