More changes to gui and server.