- fixed server and client
- needs more testing