diff --git a/configure b/configure
index 60d63058..e09b0bf4 100755
--- a/configure
+++ b/configure
@@ -634,8 +634,8 @@ ac_ct_CXX
 CXXFLAGS
 CXX
 CPP
-wwwuser
 wwwdir
+wwwuser
 enable_optyangs
 with_libxml2
 with_restconf
@@ -3349,13 +3349,15 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 
- # If yes, compile apps/restconf
+ # Set to evhtp or fcgi -> compile apps/restconf
 
 
-wwwdir=/www-data
-
+# Web user default (ie what RESTCONF daemon runs as).
 wwwuser=www-data
 
+# Home dir for web user
+wwwdir=/www-data
+
 
 #
 ac_ext=c
@@ -4979,7 +4981,6 @@ fi
 # --without-restconf    No restconf support
 # --with-restconf=fcgi  FCGI interface for separate web reverse proxy like nginx
 # --with-restconf=evhtp Integration with embedded web server libevhtp
-# Real one
 
 # Check whether --with-restconf was given.
 if test "${with_restconf+set}" = set; then :
@@ -5375,7 +5376,7 @@ fi
 
 # Common actions for all restconf packages
 if test "x${with_restconf}" != "x"; then
-   # This is for changing web user default www-data
+   # Web user default (ie what RESTCONF daemon runs as). Default: www-data
    # Should this be a runtime option?
 
 # Check whether --with-wwwuser was given.
diff --git a/configure.ac b/configure.ac
index 942b7845..4cf4a439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,11 +93,13 @@ AC_SUBST(INSTALLFLAGS)
 AC_SUBST(CLIXON_DEFAULT_CONFIG)
 AC_SUBST(LIBS)
 AC_SUBST(SH_SUFFIX)
-AC_SUBST(with_restconf) # If yes, compile apps/restconf
+AC_SUBST(with_restconf) # Set to evhtp or fcgi -> compile apps/restconf
 AC_SUBST(with_libxml2)  
 AC_SUBST(enable_optyangs) 
-AC_SUBST(wwwdir,/www-data)
+# Web user default (ie what RESTCONF daemon runs as).
 AC_SUBST(wwwuser,www-data)
+# Home dir for web user
+AC_SUBST(wwwdir,/www-data)
 
 #
 AC_PROG_CC()
@@ -197,7 +199,6 @@ AC_CHECK_LIB(cligen, cligen_init,, AC_MSG_ERROR([CLIgen missing. Try: git clone
 # --without-restconf    No restconf support
 # --with-restconf=fcgi  FCGI interface for separate web reverse proxy like nginx
 # --with-restconf=evhtp Integration with embedded web server libevhtp
-# Real one
 AC_ARG_WITH([restconf],
 	AS_HELP_STRING([--with-restconf=fcgi],[FCGI interface for stand-alone web rev-proxy eg nginx (default)]),
 	,
@@ -238,7 +239,7 @@ AC_ARG_WITH([restconf],
 
 # Common actions for all restconf packages
 if test "x${with_restconf}" != "x"; then
-   # This is for changing web user default www-data
+   # Web user default (ie what RESTCONF daemon runs as). Default: www-data
    # Should this be a runtime option?
    AC_ARG_WITH([wwwuser],
             [AS_HELP_STRING([--with-wwwuser=<user>],[Set www user different from www-data])])
diff --git a/test/config.sh.in b/test/config.sh.in
index fa1a6294..51179181 100755
--- a/test/config.sh.in
+++ b/test/config.sh.in
@@ -1,9 +1,57 @@
 #!/usr/bin/env bash
-# Generated from autotools
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+# Generated from autotools, ie from the ./configure run,
+# See configure.ac for source
 
+# This is for RESTCONF. There are three options:
+# --without-restconf    No restconf support
+# --with-restconf=fcgi  FCGI interface for separate web reverse proxy like nginx
+# --with-restconf=evhtp Integration with embedded web server libevhtp
 WITH_RESTCONF=@with_restconf@ # evhtp, fcgi or ""
-WITH_LIBXML2=@with_libxml2@ # yes or ""
+
+# This is for libxml2 XSD regex engine
+# Note this only enables the compiling of the code. In order to actually
+# use it you need to set Clixon config option CLICON_YANG_REGEXP to libxml2
+WITH_LIBXML2=@with_libxml2@
+
+# C++ compiler
 CXX=@CXX@
+
+# C compiler
 CC=@CC@
+
+# Web user default (ie what RESTCONF daemon runs as). Default: www-data
 WWWUSER=@wwwuser@
+
+# Home dir for web user, by default /www-data
 WWWDIR=@wwwdir@
diff --git a/test/lib.sh b/test/lib.sh
index d94e6147..c01dbcb8 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -81,7 +81,7 @@ testname=
 # If set, enable debugging (of backend and restconf daemons)
 : ${DBG:=0}
 
-# If set to 0, override starting of clixon_resrtcong in test (you bring your own)
+# If set to 0, override starting of clixon_restconf in test (you bring your own)
 : ${RC:=1}
 
 # Where to log restconf. Some systems may not have syslog,