More Changes to server.java