changed server function name
small fixes