Server changes

- few changes to server
- getting ready client to connect