small fixes to server and client.. not yet done with them