fixed issues with client and \r in server
sync isue