a few changes to server files