diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5142b9a..b8274039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Clixon CHANGELOG
 	
-- removed api_path extension from internal netconf	
-- Strings in xmldb_put not properly encoded, eg eth/0 became eth.00000
+## 3.3.1
 
+- Fixed yang leafref cli completion.
+
+- Removed non-standard api_path extension from internal netconf so that the internal com.
+
+- Strings in xmldb_put not properly encoded, eg eth/0 became eth.00000
+	
 ## 3.3.0
 
 May 2017	
diff --git a/README.md b/README.md
index ec7ad802..55d380fa 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ generated CLI and configuration interface.
 
 Dependencies
 ============
-Clixon is dependend on the following software packages, which need to exist on the target machine.
+Clixon depends on the following software packages, which need to exist on the target machine.
 - [CLIgen](http://www.cligen.se) is required for building Clixon. If you need 
 to build and install CLIgen: 
 ```
diff --git a/configure b/configure
index d48a768e..6d017b08 100755
--- a/configure
+++ b/configure
@@ -2136,7 +2136,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CLIXON_VERSION_MAJOR="3"
 CLIXON_VERSION_MINOR="3"
-CLIXON_VERSION_PATCH="0"
+CLIXON_VERSION_PATCH="1"
 CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
 # Fix to specific version (eg 3.5) or head (3)
 CLIGEN_VERSION="3"
@@ -2172,8 +2172,8 @@ _ACEOF
 
  # Bind to specific CLIgen version
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}_PRE1" >&5
-$as_echo "CLIXON version is ${CLIXON_VERSION}_PRE1" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}" >&5
+$as_echo "CLIXON version is ${CLIXON_VERSION}" >&6; }
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.ac b/configure.ac
index 7d5c12df..1fd02985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_SUBST(CLIXON_VERSION_MAJOR)
 AC_SUBST(CLIXON_VERSION_MINOR)
 AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version
 
-AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION}_PRE1)
+AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION})
 
 AC_CANONICAL_TARGET
 AC_SUBST(CC)
diff --git a/datastore/keyvalue/Makefile.in b/datastore/keyvalue/Makefile.in
index 27c88f27..f3fbc231 100644
--- a/datastore/keyvalue/Makefile.in
+++ b/datastore/keyvalue/Makefile.in
@@ -80,13 +80,13 @@ distclean: clean
 	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $<
 
 install: $(PLUGIN)
-	install -d $(DESTDIR)$(clixon_LIBDIR)/xmldb
-	install $(PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/xmldb
+	install -d $(DESTDIR)$(libdir)/xmldb
+	install $(PLUGIN) $(DESTDIR)$(libdir)/xmldb
 
 install-include:
 
 uninstall: 
-	rm -rf $(DESTDIR)$(clixon_LIBDIR)/xmldb/$(PLUGIN)
+	rm -rf $(DESTDIR)$(libdir)/xmldb/$(PLUGIN)
 
 TAGS:
 	find . -name '*.[chyl]' -print | etags -
diff --git a/datastore/text/Makefile.in b/datastore/text/Makefile.in
index b9dd3806..79c97729 100644
--- a/datastore/text/Makefile.in
+++ b/datastore/text/Makefile.in
@@ -79,8 +79,8 @@ distclean: clean
 	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $<
 
 install: $(PLUGIN)
-	install -d $(DESTDIR)$(clixon_LIBDIR)/xmldb
-	install $(PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/xmldb
+	install -d $(DESTDIR)$(libdir)/xmldb
+	install $(PLUGIN) $(DESTDIR)$(libdir)/xmldb
 
 install-include:
 
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 44026761..742ea639 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -266,10 +266,10 @@ xml_spec_populate(cxobj  *x,
     else
 	y = yang_find_topnode(yspec, name); /* still NULL for config */
     if (y==NULL){
-	clicon_err(OE_XML, EBADF, "yang spec not found for xml node '%s' xml parent name: '%s' yangspec:'",
-                  name, 
-                  xp?xml_name(xp):"", yp?yp->ys_argument:"");
-       goto done;
+	clicon_err(OE_XML, EBADF, "yang spec not found for xml node '%s' xml parent name: '%s' yangspec:'%s']", 
+		   name, 
+		   xp?xml_name(xp):"", yp?yp->ys_argument:"");
+	goto done;
     }
     xml_spec_set(x, y);
     retval = 0;
@@ -395,7 +395,7 @@ text_get(xmldb_handle xh,
     /* Here xt looks like: <config>...</config> */
     /* Validate existing config tree */
     if (xml_apply(xt, CX_ELMNT, xml_spec_populate, yspec) < 0)
-       goto done;
+	goto done;
 
     /* XXX Maybe the below is general function and should be moved to xmldb? */
     if (xpath_vec(xt, xpath?xpath:"/", &xvec, &xlen) < 0)
@@ -799,6 +799,7 @@ text_put(xmldb_handle        xh,
     }
     /* 2. File is not empty <top><config>...</config></top> -> replace root */
     else{ 
+
 	/* There should only be one element and called config */
 	if (singleconfigroot(x0, &x0) < 0)
 	    goto done;