Update to Server

Fixed some coding issues on the server.