minor changes to servberry and abstract user