Improving the server interface, adding more commenting.