Fixing client\server

for daniel stoveman
-Steven~