minor changes in server structure