Server: comments + small bugfixes