minor modified server and clients