made a few slight changes to server implementation