Small refinements inside server code, improved comments a bit