Some more changes to GUI code and server code.