move server material
small fixups