Server updates

- few changes to Server class